From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun, 25 Mar 2012 10:07:15 +0000 (-0300)
Subject: shell-gtk-embed: Fix NULL pointer dereference
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5941
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f563fb124ec9dae29695daefba6f543981f5f36d;p=gnome-shell.git

shell-gtk-embed: Fix NULL pointer dereference

Clutter will try to unmap during a dispose if we have a parent, so if we
set our own actor to NULL before the chain up, we're going to attempt to
unmap our own NULL actor. Fix that by swapping the order in which we
chain up.

https://bugzilla.gnome.org/show_bug.cgi?id=672790
---

diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index 8120e1eb2..2232919c5 100644
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -223,9 +223,9 @@ shell_gtk_embed_dispose (GObject *object)
 {
   ShellGtkEmbed *embed = SHELL_GTK_EMBED (object);
 
-  shell_gtk_embed_set_window (embed, NULL);
-
   G_OBJECT_CLASS (shell_gtk_embed_parent_class)->dispose (object);
+
+  shell_gtk_embed_set_window (embed, NULL);
 }
 
 static void